Fix the drawing of tearoff menu items which don't come first in their

Thu Feb  5 01:50:19 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix
	the drawing of tearoff menu items which don't come first in their
	menu.  (#33311)

diff --git a/ChangeLog b/ChangeLog
index 3e12f2e1d82698d4a841460aaaed752f74699dac..c0b7093b357eebfe71defcb948c84566749ac585 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb  5 01:50:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix
+       the drawing of tearoff menu items which don't come first in their
+       menu.  (#33311)
+
 Thu Feb  5 00:59:08 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e12f2e1d82698d4a841460aaaed752f74699dac..c0b7093b357eebfe71defcb948c84566749ac585 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Feb  5 01:50:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix
+       the drawing of tearoff menu items which don't come first in their
+       menu.  (#33311)
+
 Thu Feb  5 00:59:08 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e12f2e1d82698d4a841460aaaed752f74699dac..c0b7093b357eebfe71defcb948c84566749ac585 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Feb  5 01:50:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix
+       the drawing of tearoff menu items which don't come first in their
+       menu.  (#33311)
+
 Thu Feb  5 00:59:08 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e12f2e1d82698d4a841460aaaed752f74699dac..c0b7093b357eebfe71defcb948c84566749ac585 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Feb  5 01:50:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix
+       the drawing of tearoff menu items which don't come first in their
+       menu.  (#33311)
+
 Thu Feb  5 00:59:08 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e12f2e1d82698d4a841460aaaed752f74699dac..c0b7093b357eebfe71defcb948c84566749ac585 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Feb  5 01:50:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_paint): Fix
+       the drawing of tearoff menu items which don't come first in their
+       menu.  (#33311)
+
 Thu Feb  5 00:59:08 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombo.c (gtk_combo_entry_key_press): Use 

diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c
index fce5fd70689f5518bef13608d1ea97151eab8ec1..1a2609eefa86d96ef9f4952263a12b49ded9b6ae 100644 (file)
--- a/gtk/gtktearoffmenuitem.c
+++ b/gtk/gtktearoffmenuitem.c
@@ -144,8 +144,8 @@ gtk_tearoff_menu_item_paint (GtkWidget   *widget,
 
       x = widget->allocation.x + GTK_CONTAINER (menu_item)->border_width;
       y = widget->allocation.y + GTK_CONTAINER (menu_item)->border_width;
-      width = widget->allocation.width - x * 2;
-      height = widget->allocation.height - y * 2;
+      width = widget->allocation.width - GTK_CONTAINER (menu_item)->border_width * 2;
+      height = widget->allocation.height - GTK_CONTAINER (menu_item)->border_width * 2;
       right_max = x + width;
 
       if (widget->state == GTK_STATE_PRELIGHT)